From: Luc Teirlinck Date: Thu, 10 Jun 2004 19:06:14 +0000 (+0000) Subject: (dired-insert-subdir): Do not store R switch in `dired-switches-alist'. X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~22062 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=d05a1ea99017febe20286a4d2b695b9095b089b0;p=emacs.git (dired-insert-subdir): Do not store R switch in `dired-switches-alist'. --- diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el index 7e96f1673ed..a58b62498ca 100644 --- a/lisp/dired-aux.el +++ b/lisp/dired-aux.el @@ -1812,10 +1812,10 @@ This function takes some pains to conform to `ls -lR' output." (push (cons dirname switches) dired-switches-alist))) (when switches-have-R (dired-build-subdir-alist switches) + (setq switches (dired-replace-in-string "R" "" switches)) (dolist (cur-ass dired-subdir-alist) (let ((cur-dir (car cur-ass))) (and (dired-in-this-tree cur-dir dirname) - (not (string= cur-dir dirname)) (let ((cur-cons (assoc-string cur-dir dired-switches-alist))) (if cur-cons (setcdr cur-cons switches)